Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 29 Jul 2011 06:53:26 +0000 (23:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 29 Jul 2011 06:53:26 +0000 (23:53 -0700)

Trivial merge